Merge lp:~cjohnston/uci-engine/no-sshuttle into lp:uci-engine

[Chris Johnston]

Add flag for using sshuttle in tests/run.py

Since we do the amulet testing in HP by default, we don't need sshuttle, and sshuttle can be a pain, so lets disable it by default.

[Evan (ev)]

Given that this check is just helpful for people who don't know to set up sshuttle first on Canonistack, it seems more logical to remove it entirely instead of hiding it behind and environment variable that will never be set.

I realise you're after something that's as non-controversial as possible, but I suspect it may be unnecessary.

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:571
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/843/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/843/rebuild

review: Needs Fixing (continuous-integration)

[Vincent Ladeuil (vila)]

I'd turn that into documentation in TRICKS and get rid of the code *and* SUDOERS, SUDOERS_FILE. Given the state of canonistack, it's unlikely people will deploy there anyway.

review: Needs Fixing

[Evan (ev)]

One way of preserving it: http://paste.ubuntu.com/7634258/

Unmerged revisions

571. By Chris Johnston on 2014-06-12

Add flag for using sshuttle in tests/run.py

=== modified file 'tests/run.py'
--- tests/run.py	2014-06-10 10:23:19 +0000
+++ tests/run.py	2014-06-12 15:19:25 +0000
@@ -234,10 +234,11 @@
         log.error(msg)
         sys.exit(1)
 
-    if not check_sudoers():
-        msg = 'Please run:\necho "$USER %s" > %s' % (SUDOERS, SUDOERS_FILE)
-        log.error(msg)
-        sys.exit(1)
+    if os.environ.get('SSHUTTLE'):
+        if not check_sudoers():
+            msg = 'Please run:\necho "$USER %s" > %s' % (SUDOERS, SUDOERS_FILE)
+            log.error(msg)
+            sys.exit(1)
 
     branches = os.path.join(HERE, '..', 'branches')
     deploy.build_sourcedeps(branches)