Commit4cfc682

committed

test_submodule works

1 parent8f219b5 commit4cfc682Copy full SHA for 4cfc682

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ def new_from_sha(cls, repo, sha1):`
`60`	`60`	`:param sha1: 20 byte binary sha1"""`
`61`	`61`	`ifsha1==cls.NULL_BIN_SHA:`
`62`	`62`	`# the NULL binsha is always the root commit`
`63`		`-returnget_object_type_by_name('commit')(repo,sha1)`
	`63`	`+returnget_object_type_by_name(b'commit')(repo,sha1)`
`64`	`64`	`# END handle special case`
`65`	`65`	`oinfo=repo.odb.info(sha1)`
`66`	`66`	`inst=get_object_type_by_name(oinfo.type)(repo,oinfo.binsha)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ def test_get_object_type_by_name(self):`
`86`	`86`	`assertbase.Objectinget_object_type_by_name(tname).mro()`
`87`	`87`	`# END for each known type`
`88`	`88`
`89`		`-assert_raises(ValueError,get_object_type_by_name,"doesntexist")`
	`89`	`+assert_raises(ValueError,get_object_type_by_name,b"doesntexist")`
`90`	`90`
`91`	`91`	`deftest_object_resolution(self):`
`92`	`92`	`# objects must be resolved to shas so they compare equal`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ def _do_base_tests(self, rwrepo):`
`80`	`80`	`assertisinstance(sm.branch_path,string_types)`
`81`	`81`
`82`	`82`	`# some commits earlier we still have a submodule, but its at a different commit`
`83`		`-smold=Submodule.iter_items(rwrepo,self.k_subm_changed).next()`
	`83`	`+smold=next(Submodule.iter_items(rwrepo,self.k_subm_changed))`
`84`	`84`	`assertsmold.binsha!=sm.binsha`
`85`	`85`	`assertsmold!=sm# the name changed`
`86`	`86`

Comments

(0)