#9 added another test for the case when the local branch and the requ…

…ested branch are different.

src/tests/test_gitrepo.py

@@ -57,7 +57,7 @@ def test_nonexitent_branch(self):
 		self.assertEqual(result['status'], 'ERROR')
 
 
-	def test_local_not_in_remote(self):
+	def test_local_not_in_remote_same_branch(self):
 		print("TEST: 'test_local_not_in_remote'")
 		# prepares a suitable configuration
 		repoconf = {}
@@ -79,6 +79,27 @@ def test_local_not_in_remote(self):
 		self.assertEqual(result['status'], 'WRONG_REMOTE')
 
 
+	def test_local_not_in_remote_different_branch(self):
+		print("TEST: 'test_local_not_in_remote'")
+		# prepares a suitable configuration
+		repoconf = {}
+		repoconf['repo'] = '[email protected]:jmnavarrol/simplest-git-subrepos.git'
+		repoconf['path'] = os.path.join(self.scenarios_path, 'standard/simplest-git-subrepos')
+
+		# First, let's clone the repo
+		result = self.gitrepo.update(repoconf)
+		print(str(result))
+		# Then, let's create a local branch
+		repo = Repo(repoconf['path'])
+		new_branch = repo.create_head('new_branch')
+		# Finally, let's update config to request the new local branch
+		repoconf['branch'] = 'new_branch'
+		repoconf['gitref_type'] = 'branch'
+		result = self.gitrepo.update(repoconf)
+		print(str(result))
+		self.assertEqual(result['status'], 'WRONG_REMOTE')
+
+
 	def test_status_not_cloned(self):
 		print("TEST: 'test_status_not_cloned'")
 		# prepares a suitable configuration