Changeset 58
- Timestamp:
- Feb 23, 2010 8:29:21 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
mergebot/trunk/utils/test.py
r57 r58 389 389 self.switch(ticket_id) 390 390 self.mv(basename, basename + '-renamed') 391 self.commit('Rename the file on branch') 392 391 self.commit('Rename the file on the branch') 392 393 self._tester.rebranch_conflict(ticket_id, 'stuff') 394 395 396 class MergeBotTestRebranchWithTrunkRenameConflict(FunctionalSvnTestCaseSetup): 397 def runTest(self): 398 """Verify that the 'rebranch' button works when a file renamed on trunk was modified on the branch""" 399 ticket_id = self._tester.create_ticket(summary=self.__class__.__name__, 400 info={'component':'stuff', 'version':'trunk'}) 401 basename = self.__class__.__name__ 402 403 # create a file in which to have conflicts 404 self.checkout() 405 self.add_new_file(basename) 406 self.commit('Add a new file on trunk') 407 408 # create the branch 409 self._tester.branch(ticket_id, 'stuff') 410 411 # rename the file on trunk 412 self.mv(basename, basename + '-renamed') 413 self.commit('Rename the file on trunk') 414 415 # rename the file on the branch 416 self.switch(ticket_id) 417 open(os.path.join(self.get_workdir(), basename), 'a').write(random_sentence()) 418 self.commit('Modify the file on the branch') 419 420 # make sure it finds the conflict 393 421 self._tester.rebranch_conflict(ticket_id, 'stuff') 394 422 … … 436 464 suite.addTest(MergeBotTestRebranchWithConflict()) 437 465 suite.addTest(MergeBotTestRebranchWithBranchRenameConflict()) 466 suite.addTest(MergeBotTestRebranchWithTrunkRenameConflict()) 438 467 suite.addTest(MergeBotTestSingleUseCase()) 439 468 return suite
Note: See TracChangeset
for help on using the changeset viewer.