Merge lp:~noise/tanuki-agent/e2e-local into lp:tanuki-agent

[Bret Barker]

allow overrides for specmgr_server and results_server to test locally

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'scripts/e2e.py'
--- scripts/e2e.py	2015-08-28 13:50:20 +0000
+++ scripts/e2e.py	2015-09-16 16:43:36 +0000
@@ -84,6 +84,8 @@
         self.platform = self.config.get('config', 'platform')
         self.interval = self.config.getfloat('config', 'interval')
         self.server = self.config.get('config', 'server')
+        self.specmgr_server = self.config.get('config', 'specmgr_server', fallback=self.server)
+        self.results_server = self.config.get('config', 'results_server', fallback=self.server)
         self.image_name = self.config.get('config', 'image_name')
         self.test_payload = self.config.get('config', 'test_payload')
         self.timeout = self.config.getint('config', 'network_timeout')
@@ -99,19 +101,19 @@
             self.config.get('config', 'image_unique_id'), rand_token)
 
         self.manifest_url = urllib.parse.urljoin(
-            self.server,
+            self.specmgr_server,
             '/'.join(['orgs', self.organization_id, 'products/manifests']))
         self.spec_url = urllib.parse.urljoin(
-            self.server,
+            self.specmgr_server,
             '/'.join(['orgs', self.organization_id, 'tests/specs']))
         self.image_url = urllib.parse.urljoin(
-            self.server,
+            self.specmgr_server,
             '/'.join(['orgs', self.organization_id, 'images']))
         self.snap_revision_url = urllib.parse.urljoin(
-            self.server,
+            self.specmgr_server,
             '/'.join(['orgs', self.organization_id, 'snap-revisions']))
         self.results_url = urllib.parse.urljoin(
-            self.server,
+            self.results_server,
             '/'.join(['orgs', self.organization_id, 'results']))
 
         if not os.path.isfile(self.confpath):