AppArmor

apparmor:160-the-trash-abstraction

  1. Git
  2. lp:apparmor
  3. 160-the-trash-abstraction
Last commit made on 2021-04-14
Get this branch:
git clone -b 160-the-trash-abstraction https://git.launchpad.net/apparmor

Branch merges

Branch information

Name:
160-the-trash-abstraction
Repository:
lp:apparmor

Recent commits

3ee4f9c... by John Johansen <email address hidden>

Merge severity.py: bump test coverage to 100%

... by adding some new tests, and by marking two lines as "pragma: no branch" because I didn't find a testcase that doesn't let them continue with the next line.

Finally, remove severity.py from the "not 100% covered" list in test/Makefile.

Also run severity tests with the official severity.db instead of the slightly outdated copy in test/.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/737
Acked-by: John Johansen <email address hidden>

a07515b... by Christian Boltz

Run severity tests with official severity.db

... instead of the slightly outdated copy in test/

d9cb8df... by Christian Boltz

severity.py: bump test coverage to 100%

... by adding some new tests, and by marking two lines as "pragma: no
branch" because I didn't find a testcase that doesn't let them continue
with the next line.

Finally, remove severity.py from the "not 100% covered" list in
test/Makefile.

94b7704... by Steve Beattie

utils: ProfileStorage - add tests with invalid type

Add tests with invalid type to ensure error handling works as expected.

Merge branch 'cboltz/cboltz-profile-storage-tests'

[Fixed conflict with prior change to utils/test/test-profile-storage.py]
Acked-by: Steve Beattie <email address hidden>
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/735

d270b2c... by Steve Beattie <email address hidden>

utils: move and rename write_header() to ProfileStorage.get_header()

Merge branch 'cboltz-move-write_header' into 'master'

As a preparation, change change_profile_flags() to use ProfileStorage,
and replace some regex usage with startswith() to make the code easier
to read and (probably) more performant.

See the individual commits for details.

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/734
Acked-by: Steve Beattie <email address hidden>

38c6302... by Christian Boltz

ProfileStorage: add tests with invalid type

... to ensure error handling works as expected.

6a170dd... by Christian Boltz

Move and rename write_header() to ProfileStorage.get_header()

Also adjust the calling code to use get_header() instead of
write_header().

Finally, move the tests to test-profile-storage.py and do a few
adjustments needed by the change. Part of these adjustments is to hand
over empty params with the correct type instead of just "None".

4ef975f... by Christian Boltz

change_profile_flags(): use ProfileStorage

... instead of a dict faking it.

9494238... by Christian Boltz

write_header(): replace regex with startswith()

... to make the code easier to read and (probably) more performant.

edf52a7... by John Johansen <email address hidden>

Merge read_profile(): use actual profile name

... instead of profile_data\[profile\]\[profile\]\['name'\] which is not always correct.

Note: setting 'name' will be fixed in a later commit/MR, but don't hold your breath for it ;-)

MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/733
Acked-by: John Johansen <email address hidden>