projectatomic / atomic

Atomic Run Tool for installing/running/managing container images.
Other
526 stars 139 forks source link

Do not call any selinux methods if selinux is disabled #1213

Closed dirkboye closed 6 years ago

dirkboye commented 6 years ago

Description

selinux.setfscreatecon_raw(None) will throw an OSError exception if selinux is disabled.

Related Issue Numbers

https://github.com/projectatomic/atomic/issues/1211

rh-atomic-bot commented 6 years ago

Can one of the admins verify this patch? I understand the following commands:

rhatdan commented 6 years ago

bot, add author to whitelist

rhatdan commented 6 years ago

bot, test pull request

rhatdan commented 6 years ago

LGTM

dirkboye commented 6 years ago

Hmm, I don't think the failure in centos/7/atomic is due to my pull request :-)


ERROR: test_find_image_on_registry (test_discovery.TestAtomicUtil)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/var/tmp/checkout/tests/unit/test_discovery.py", line 15, in test_find_image_on_registry
    self.assertEqual(ri.find_image_on_registry(), fq)
  File "Atomic/discovery.py", line 96, in find_image_on_registry
    raise RegistryInspectError("Unable to find {}".format(self.orig_input))
RegistryInspectError: Unable to find None

----------------------------------------------------------------------```
rhatdan commented 6 years ago

@baude @giuseppe PTAL

giuseppe commented 6 years ago

@rh-atomic-bot r+

rh-atomic-bot commented 6 years ago

:pushpin: Commit c006bda has been approved by giuseppe

rh-atomic-bot commented 6 years ago

:hourglass: Testing commit c006bda with merge cf17675...

rh-atomic-bot commented 6 years ago

:broken_heart: Test failed - status-papr

giuseppe commented 6 years ago

@rh-atomic-bot retry

rh-atomic-bot commented 6 years ago

:hourglass: Testing commit c006bda with merge 119f123...

rh-atomic-bot commented 6 years ago

:sunny: Test successful - status-papr Approved by: giuseppe Pushing 119f1236bb08b079241b6ad64230e58fec217f26 to master...