← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-proposed

« back to all changes in this revision

Viewing changes to neutron/tests/functional/base.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-04-15 13:59:07 UTC
  • mfrom: (1.1.22)
  • Revision ID: package-import@ubuntu.com-20150415135907-z10fr18evag1ozq3
Tags: 1:2015.1~rc1-0ubuntu1
* New upstream milestone release:
  - debian/control: Update dependencies. 
  - debian/patches/disable-udev-tests.patch: Dropped no longer needed.
  - debian/patches/fixup-driver-test-execution.patch: Dropped no longer needed.
  - debian/patches/skip-iptest.patch: Skip failing test
  - debian/neutron-plugin-openvswitch-agent.install: Added neutron-ovsvapp-agent binary.
  - debian/neutron-plugin-cisco.install: Added neutron-cisco-apic-service-agent and 
    neutron-cisco-apic-host-agent

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/tests/functional/base.py
18
18
from oslo_config import cfg
19
19
 
20
20
from neutron.agent.common import config
 
21
from neutron.agent.linux import utils
21
22
from neutron.tests import base
22
23
 
23
24
SUDO_CMD = 'sudo -n'
59
60
        self.config(group='AGENT',
60
61
                    root_helper_daemon=os.environ.get(
61
62
                        'OS_ROOTWRAP_DAEMON_CMD'))
 
63
 
 
64
    def check_command(self, cmd, error_text, skip_msg, run_as_root=False):
 
65
        try:
 
66
            utils.execute(cmd, run_as_root=run_as_root)
 
67
        except RuntimeError as e:
 
68
            if error_text in str(e) and not self.fail_on_missing_deps:
 
69
                self.skipTest(skip_msg)
 
70
            raise