@@ -284,10 +284,11 @@ def _do_base_tests(self, rwrepo):
284
284
self .failUnlessRaises (InvalidGitRepositoryError , sm .remove )
285
285
286
286
# forcibly delete the child repository
287
+ prev_count = len (sm .children ())
287
288
assert csm .remove (force = True ) is csm
288
289
assert not csm .exists ()
289
290
assert not csm .module_exists ()
290
- assert len (sm .children ()) == 0
291
+ assert len (sm .children ()) == prev_count - 1
291
292
# now we have a changed index, as configuration was altered.
292
293
# fix this
293
294
sm .module ().index .reset (working_tree = True )
@@ -411,7 +412,7 @@ def test_root_module(self, rwrepo):
411
412
412
413
# deep traversal git / async
413
414
rsmsp = [sm .path for sm in rm .traverse ()]
414
- assert len (rsmsp ) == 1 # git and async, async being a child of git
415
+ assert len (rsmsp ) == 2 # git, async, smmap, async being a child of git.
415
416
416
417
# cannot set the parent commit as root module's path didn't exist
417
418
self .failUnlessRaises (ValueError , rm .set_parent_commit , 'HEAD' )
@@ -564,13 +565,13 @@ def test_root_module(self, rwrepo):
564
565
# =================
565
566
# finally we recursively update a module, just to run the code at least once
566
567
# remove the module so that it has more work
567
- assert len (nsm .children ()) == 1
568
- assert nsm .exists () and nsm .module_exists () and len (nsm .children ()) = = 1
568
+ assert len (nsm .children ()) >= 1 # could include smmap
569
+ assert nsm .exists () and nsm .module_exists () and len (nsm .children ()) > = 1
569
570
# assure we pull locally only
570
571
nsmc = nsm .children ()[0 ]
571
572
nsmc .config_writer ().set_value ('url' , async_url )
572
573
rm .update (recursive = True , progress = prog , dry_run = True ) # just to run the code
573
574
rm .update (recursive = True , progress = prog )
574
575
575
- assert len (nsm .children ()) == 1 and nsmc .module_exists ()
576
+ assert len (nsm .children ()) >= 2 and nsmc .module_exists ()
576
577
0 commit comments