Skip to content

Commit

Permalink
Updated tests, still refers to hardcoded path though
Browse files Browse the repository at this point in the history
  • Loading branch information
Martin Gejke committed Sep 4, 2018
1 parent 345f8e7 commit c3f94ee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
":sys_platform=='win32'": ['pypiwin32']
}

version = '1.0.1'
version = '1.0.2'

setup(name='qtm',
version=version,
Expand Down
2 changes: 1 addition & 1 deletion test/rest_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def test_get_v1(self):

def test_get_experimental(self):
d = self.rest.get_experimental()
d.addCallback(self.assertEqual, ['command', 'settings', 'workerstate'])
d.addCallback(self.assertEqual, ['command', 'measurements', 'settings', 'workerstate'])
return d

def test_get_workerstate(self):
Expand Down
8 changes: 5 additions & 3 deletions test/rt_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
from qtm import QRT, QRTConnection, QRTCommandException


MEASUREMENT = "e:/measurements/3d_analog_6dof_big27file.qtm"

class TestConnection(unittest.TestCase):

def setUp(self):
Expand Down Expand Up @@ -63,7 +65,7 @@ def setUp(self):
self.qrt.connect(on_connect=self.on_connect, on_disconnect=None, on_event=None)
yield self.defered_connection
yield self.connection.take_control('password')
yield self.connection.load("d:/measurements/3d_analog_6dof_big27file.qtm")
yield self.connection.load(MEASUREMENT)
yield self.connection.start(rtfromfile=True)

def tearDown(self):
Expand Down Expand Up @@ -171,7 +173,7 @@ def setUp(self):
yield self.defered_connection
yield self.defered_connection
yield self.connection.take_control('password')
yield self.connection.load("d:/measurements/3d_analog_6dof_big27file.qtm")
yield self.connection.load(MEASUREMENT)
yield self.connection.start(rtfromfile=True)

def tearDown(self):
Expand Down Expand Up @@ -268,7 +270,7 @@ def test_get_parameters(self):
def test_multiple_commands(self):
d = []
d.append(self.connection.take_control("password"))
d.append(self.connection.load("d:\measurements\FirstMiqusMeasurement.qtm"))
d.append(self.connection.load(MEASUREMENT))
d.append(self.connection.start(rtfromfile=True))
d.append(self.connection.stop())
d.append(self.connection.close())
Expand Down

0 comments on commit c3f94ee

Please sign in to comment.