src: constify is_<platform>() calls · gitpython-developers/GitPython@e61439b
@@ -85,7 +85,7 @@ def test_it_transforms_kwargs_into_git_command_arguments(self):
85858686# order is undefined
8787res = self.git.transform_kwargs(**{'s': True, 't': True})
88-assert ['-s', '-t'] == res or ['-t', '-s'] == res
88+self.assertEqual(set(['-s', '-t']), set(res))
89899090def test_it_executes_git_to_shell_and_returns_result(self):
9191assert_match('^git version [\d\.]{2}.*$', self.git.execute(["git", "version"]))
@@ -117,7 +117,7 @@ def test_persistent_cat_file_command(self):
117117g.stdin.write(b"b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
118118g.stdin.flush()
119119obj_info_two = g.stdout.readline()
120-assert obj_info == obj_info_two
120+self.assertEqual(obj_info, obj_info_two)
121121122122# read data - have to read it in one large chunk
123123size = int(obj_info.split()[2])
@@ -127,18 +127,19 @@ def test_persistent_cat_file_command(self):
127127# now we should be able to read a new object
128128g.stdin.write(b"b2339455342180c7cc1e9bba3e9f181f7baa5167\n")
129129g.stdin.flush()
130-assert g.stdout.readline() == obj_info
130+self.assertEqual(g.stdout.readline(), obj_info)
131131132132# same can be achived using the respective command functions
133133hexsha, typename, size = self.git.get_object_header(hexsha)
134134hexsha, typename_two, size_two, data = self.git.get_object_data(hexsha)
135-assert typename == typename_two and size == size_two
135+self.assertEqual(typename, typename_two)
136+self.assertEqual(size, size_two)
136137137138def test_version(self):
138139v = self.git.version_info
139-assert isinstance(v, tuple)
140+self.assertIsInstance(v, tuple)
140141for n in v:
141-assert isinstance(n, int)
142+self.assertIsInstance(n, int)
142143# END verify number types
143144144145def test_cmd_override(self):
@@ -174,28 +175,28 @@ def test_insert_after_kwarg_raises(self):
174175def test_env_vars_passed_to_git(self):
175176editor = 'non_existant_editor'
176177with mock.patch.dict('os.environ', {'GIT_EDITOR': editor}):
177-assert self.git.var("GIT_EDITOR") == editor
178+self.assertEqual(self.git.var("GIT_EDITOR"), editor)
178179179180@with_rw_directory
180181def test_environment(self, rw_dir):
181182# sanity check
182-assert self.git.environment() == {}
183+self.assertEqual(self.git.environment(), {})
183184184185# make sure the context manager works and cleans up after itself
185186with self.git.custom_environment(PWD='/tmp'):
186-assert self.git.environment() == {'PWD': '/tmp'}
187+self.assertEqual(self.git.environment(), {'PWD': '/tmp'})
187188188-assert self.git.environment() == {}
189+self.assertEqual(self.git.environment(), {})
189190190191old_env = self.git.update_environment(VARKEY='VARVALUE')
191192# The returned dict can be used to revert the change, hence why it has
192193# an entry with value 'None'.
193-assert old_env == {'VARKEY': None}
194-assert self.git.environment() == {'VARKEY': 'VARVALUE'}
194+self.assertEqual(old_env, {'VARKEY': None})
195+self.assertEqual(self.git.environment(), {'VARKEY': 'VARVALUE'})
195196196197new_env = self.git.update_environment(**old_env)
197-assert new_env == {'VARKEY': 'VARVALUE'}
198-assert self.git.environment() == {}
198+self.assertEqual(new_env, {'VARKEY': 'VARVALUE'})
199+self.assertEqual(self.git.environment(), {})
199200200201path = os.path.join(rw_dir, 'failing-script.sh')
201202stream = open(path, 'wt')
@@ -214,11 +215,11 @@ def test_environment(self, rw_dir):
214215try:
215216remote.fetch()
216217except GitCommandError as err:
217-if sys.version_info[0] < 3 and is_darwin():
218-assert 'ssh-origin' in str(err)
219-assert err.status == 128
218+if sys.version_info[0] < 3 and is_darwin:
219+self.assertIn('ssh-orig, ' in str(err))
220+self.assertEqual(err.status, 128)
220221else:
221-assert 'FOO' in str(err)
222+self.assertIn('FOO', str(err))
222223# end
223224# end
224225# end if select.poll exists