Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: drop sudo in tests already running as root

Browse Source 
Don't spam already trashed log.
This commit is contained in:
Marek Marczykowski-Górecki 2018-09-07 15:04:00 +02:00
parent 1b99bd9ab3
commit 8ce3433406
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes/tests/__init__.py
View File

@ -849,7 +849,7 @@ class SystemTestCase(QubesTestCase):
''' '''
try: try:
volumes = subprocess.check_output( volumes = subprocess.check_output(
['sudo', 'lvs', '--noheadings', '-o', 'vg_name,name', ['lvs', '--noheadings', '-o', 'vg_name,name',
'--separator', '/']).decode() '--separator', '/']).decode()
if ('/vm-' + prefix) not in volumes: if ('/vm-' + prefix) not in volumes:
return return

27
qubes/tests/integ/dom0_update.py
View File

@ -78,23 +78,18 @@ Expire-Date: 0
cls.keyid = cls.generate_key(cls.tmpdir) cls.keyid = cls.generate_key(cls.tmpdir)
p = subprocess.Popen(['sudo', 'dd', with open('/etc/yum.repos.d/test.repo', 'w') as repo_file:
'status=none', 'of=/etc/yum.repos.d/test.repo'], repo_file.write('''
stdin=subprocess.PIPE)
p.stdin.write(b'''
[test] [test]
name = Test name = Test
baseurl = http://localhost:8080/ baseurl = http://localhost:8080/
enabled = 1 enabled = 1
''') ''')
p.stdin.close()
p.wait()
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
subprocess.check_call(['sudo', 'rm', '-f', os.unlink('/etc/yum.repos.d/test.repo')
'/etc/yum.repos.d/test.repo'])
shutil.rmtree(cls.tmpdir) shutil.rmtree(cls.tmpdir)
@ -113,9 +108,9 @@ enabled = 1
self.loop.run_until_complete(self.updatevm.create_on_disk()) self.loop.run_until_complete(self.updatevm.create_on_disk())
self.app.updatevm = self.updatevm self.app.updatevm = self.updatevm
self.app.save() self.app.save()
subprocess.call(['sudo', 'rpm', '-e', self.pkg_name], subprocess.call(['rpm', '-e', self.pkg_name],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
subprocess.check_call(['sudo', 'rpm', '--import', subprocess.check_call(['rpm', '--import',
os.path.join(self.tmpdir, 'pubkey.asc')]) os.path.join(self.tmpdir, 'pubkey.asc')])
self.loop.run_until_complete(self.updatevm.start()) self.loop.run_until_complete(self.updatevm.start())
self.repo_running = False self.repo_running = False
@ -128,9 +123,9 @@ enabled = 1
del self.repo_proc del self.repo_proc
super(TC_00_Dom0UpgradeMixin, self).tearDown() super(TC_00_Dom0UpgradeMixin, self).tearDown()
subprocess.call(['sudo', 'rpm', '-e', self.pkg_name], subprocess.call(['rpm', '-e', self.pkg_name],
stderr=subprocess.DEVNULL) stderr=subprocess.DEVNULL)
subprocess.call(['sudo', 'rpm', '-e', 'gpg-pubkey-{}'.format( subprocess.call(['rpm', '-e', 'gpg-pubkey-{}'.format(
self.keyid)], stderr=subprocess.DEVNULL) self.keyid)], stderr=subprocess.DEVNULL)
for pkg in os.listdir(self.tmpdir): for pkg in os.listdir(self.tmpdir):
@ -165,7 +160,7 @@ Test package
spec_path]) spec_path])
pkg_path = os.path.join(dir, 'x86_64', pkg_path = os.path.join(dir, 'x86_64',
'{}-{}-1.x86_64.rpm'.format(name, version)) '{}-{}-1.x86_64.rpm'.format(name, version))
subprocess.check_call(['sudo', 'chmod', 'go-rw', '/dev/tty']) subprocess.check_call(['chmod', 'go-rw', '/dev/tty'])
subprocess.check_call( subprocess.check_call(
['rpm', '--quiet', '--define=_gpg_path {}'.format(dir), ['rpm', '--quiet', '--define=_gpg_path {}'.format(dir),
'--define=_gpg_name {}'.format("Qubes test"), '--define=_gpg_name {}'.format("Qubes test"),
@ -173,7 +168,7 @@ Test package
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
subprocess.check_call(['sudo', 'chmod', 'go+rw', '/dev/tty']) subprocess.check_call(['chmod', 'go+rw', '/dev/tty'])
return pkg_path return pkg_path
def send_pkg(self, filename): def send_pkg(self, filename):
@ -212,7 +207,7 @@ Test package
- "updates pending" flag is cleared - "updates pending" flag is cleared
""" """
filename = self.create_pkg(self.tmpdir, self.pkg_name, '1.0') filename = self.create_pkg(self.tmpdir, self.pkg_name, '1.0')
subprocess.check_call(['sudo', 'rpm', '-i', filename]) subprocess.check_call(['rpm', '-i', filename])
filename = self.create_pkg(self.tmpdir, self.pkg_name, '2.0') filename = self.create_pkg(self.tmpdir, self.pkg_name, '2.0')
self.send_pkg(filename) self.send_pkg(filename)
open(self.update_flag_path, 'a').close() open(self.update_flag_path, 'a').close()
@ -331,7 +326,7 @@ Test package
self.pkg_name)) self.pkg_name))
def test_020_install_wrong_sign(self): def test_020_install_wrong_sign(self):
subprocess.call(['sudo', 'rpm', '-e', 'gpg-pubkey-{}'.format( subprocess.call(['rpm', '-e', 'gpg-pubkey-{}'.format(
self.keyid)]) self.keyid)])
filename = self.create_pkg(self.tmpdir, self.pkg_name, '1.0') filename = self.create_pkg(self.tmpdir, self.pkg_name, '1.0')
self.send_pkg(filename) self.send_pkg(filename)