Merge pull request GoogleCloudPlatform#70 from aozarov/master

Remove a special case where the appengine-pipeline generate task_target for default module
VirusTotal · Jul 7, 2016 · 2773946 · 2773946
2 parents b18ab02 + 2f1930b
commit 2773946
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/python/src/pipeline/util.py b/python/src/pipeline/util.py
@@ -63,8 +63,6 @@ def _get_task_target():
 
   version = os.environ["CURRENT_VERSION_ID"].split(".")[0]
   module = os.environ["CURRENT_MODULE_ID"]
-  if module == "default":
-    return version
   return "%s.%s" % (version, module)
 
 

diff --git a/python/test/util_test.py b/python/test/util_test.py
@@ -41,10 +41,10 @@ def testGetTaskTarget(self):
 
   def testGetTaskTargetDefaultModule(self):
     os.environ["CURRENT_MODULE_ID"] = "default"
-    self.assertEqual("v7", util._get_task_target())
+    self.assertEqual("v7.default", util._get_task_target())
     task = taskqueue.Task(url="/relative_url",
                           target=util._get_task_target())
-    self.assertEqual("v7", task.target)
+    self.assertEqual("v7.default", task.target)
 
 
 if __name__ == '__main__':