fix tests on travis

This commit is contained in:
Alan Hamlett 2016-06-01 10:24:02 +02:00
parent aaf49a5c22
commit e918bb0997
2 changed files with 45 additions and 30 deletions

View file

@ -75,7 +75,6 @@ class DependenciesTestCase(utils.TestCase):
'lines': 36, 'lines': 36,
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -88,7 +87,9 @@ class DependenciesTestCase(utils.TestCase):
} }
expected_dependencies = [] expected_dependencies = []
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('dependencies', []) dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].get('dependencies', [])
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -120,7 +121,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -144,7 +144,9 @@ class DependenciesTestCase(utils.TestCase):
'unittest', 'unittest',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -172,7 +174,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -185,7 +186,9 @@ class DependenciesTestCase(utils.TestCase):
} }
expected_dependencies = ['animate.css', 'moment', 'moment-timezone'] expected_dependencies = ['animate.css', 'moment', 'moment-timezone']
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
for dep in expected_dependencies: for dep in expected_dependencies:
self.assertIn(dep, self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']) self.assertIn(dep, self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'])
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -217,7 +220,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -234,7 +236,9 @@ class DependenciesTestCase(utils.TestCase):
'foobar', 'foobar',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -266,7 +270,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -281,7 +284,9 @@ class DependenciesTestCase(utils.TestCase):
'openssl', 'openssl',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -313,7 +318,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -328,7 +332,9 @@ class DependenciesTestCase(utils.TestCase):
'openssl', 'openssl',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
@ -360,7 +366,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'dependencies': ANY, 'dependencies': ANY,
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -378,7 +383,9 @@ class DependenciesTestCase(utils.TestCase):
'WakaTime', 'WakaTime',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
@ -410,7 +417,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'dependencies': ANY, 'dependencies': ANY,
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -434,7 +440,9 @@ class DependenciesTestCase(utils.TestCase):
"'ServiceLocatorTwo.php'", "'ServiceLocatorTwo.php'",
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
@ -466,7 +474,6 @@ class DependenciesTestCase(utils.TestCase):
'dependencies': ANY, 'dependencies': ANY,
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -481,7 +488,9 @@ class DependenciesTestCase(utils.TestCase):
'"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"', '"https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
@ -513,7 +522,6 @@ class DependenciesTestCase(utils.TestCase):
'dependencies': ANY, 'dependencies': ANY,
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -528,7 +536,9 @@ class DependenciesTestCase(utils.TestCase):
'"libs/json2.js"', '"libs/json2.js"',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
@ -560,7 +570,6 @@ class DependenciesTestCase(utils.TestCase):
'entity': os.path.realpath(entity), 'entity': os.path.realpath(entity),
'project': u(os.path.basename(os.path.realpath('.'))), 'project': u(os.path.basename(os.path.realpath('.'))),
'dependencies': ANY, 'dependencies': ANY,
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -584,7 +593,9 @@ class DependenciesTestCase(utils.TestCase):
'"supress"', '"supress"',
] ]
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies'] dependencies = self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0]['dependencies']
self.assertListsEqual(dependencies, expected_dependencies) self.assertListsEqual(dependencies, expected_dependencies)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))

View file

@ -187,7 +187,6 @@ class BaseTestCase(utils.TestCase):
'lines': 2, 'lines': 2,
'entity': os.path.abspath(entity), 'entity': os.path.abspath(entity),
'project': os.path.basename(os.path.abspath('.')), 'project': os.path.basename(os.path.abspath('.')),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -199,7 +198,9 @@ class BaseTestCase(utils.TestCase):
u('lines'): 2, u('lines'): 2,
} }
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called() self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
@ -228,7 +229,6 @@ class BaseTestCase(utils.TestCase):
'lines': 2, 'lines': 2,
'entity': 'HIDDEN.txt', 'entity': 'HIDDEN.txt',
'project': os.path.basename(os.path.abspath('.')), 'project': os.path.basename(os.path.abspath('.')),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -240,7 +240,9 @@ class BaseTestCase(utils.TestCase):
u('lines'): 2, u('lines'): 2,
} }
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called() self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
@ -288,7 +290,6 @@ class BaseTestCase(utils.TestCase):
'lines': 2, 'lines': 2,
'entity': 'HIDDEN.txt', 'entity': 'HIDDEN.txt',
'project': os.path.basename(os.path.abspath('.')), 'project': os.path.basename(os.path.abspath('.')),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -300,7 +301,9 @@ class BaseTestCase(utils.TestCase):
u('lines'): 2, u('lines'): 2,
} }
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called() self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
@ -352,7 +355,6 @@ class BaseTestCase(utils.TestCase):
'lines': 2, 'lines': 2,
'entity': 'HIDDEN.txt', 'entity': 'HIDDEN.txt',
'project': os.path.basename(os.path.abspath('.')), 'project': os.path.basename(os.path.abspath('.')),
'branch': os.environ.get('TRAVIS_COMMIT', ANY),
'time': float(now), 'time': float(now),
'type': 'file', 'type': 'file',
} }
@ -364,7 +366,9 @@ class BaseTestCase(utils.TestCase):
u('lines'): 2, u('lines'): 2,
} }
self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(heartbeat, ANY, None) self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
self.assertEquals(heartbeat[key], val)
self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1])) self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called() self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()