Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • S squid
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Merge requests 3
    • Merge requests 3
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • Debian Squid Maintainers
  • squid
  • Merge requests
  • !9

Fix apparmor dep8 test in lxc

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Andreas Hasenack requested to merge ahasenack/squid:fix-apparmor-dep8-in-lxc into master Jul 31, 2019
  • Overview 1
  • Commits 3
  • Pipelines 0
  • Changes 1

This should fix the apparmor dep8 test in debian CI, which runs on LXC configured in a way that loading a profile will fail. Last lines of a run in a debian LXC container on a debian VM as host:

...
Enabling site default-ssl.
To activate the new configuration, you need to run:
  systemctl reload apache2
test_CVE_2011_3205 (__main__.BasicTest)
Test parsing lines > 4096 in length (CVE-2011-3205) ... ok
test_daemons (__main__.BasicTest)
Test daemon ... ok
test_ftp_proxy (__main__.BasicTest)
Test ftp ... ok
test_http_proxy (__main__.BasicTest)
Test http ... ok
test_https_proxy (__main__.BasicTest)
Test https ... ok
test_squidclient (__main__.BasicTest)
Test squidclient ... ok
test_zz_apparmor (__main__.BasicTest)
Test apparmor ... ok

----------------------------------------------------------------------
Ran 7 tests in 270.069s

OK
autopkgtest [09:44:35]: test squid: -----------------------]
autopkgtest [09:44:35]: test squid:  - - - - - - - - - - results - - - - - - - - - -
squid                PASS
autopkgtest [09:44:35]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-test-suite  PASS
squid                PASS

In that same configuration, the original squid-4.8-1 fails to pass, so I'm confident I replicated the failure that happened in debian CI. I didn't squash the two commits because I wanted to show the first commit is just a revert of what was added before, and then I added my fix. I think it's more visible that way, but, if this PR is accepted, feel free to squash the commits, or ask me to do the squashing.

Edited Jul 31, 2019 by Andreas Hasenack
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: fix-apparmor-dep8-in-lxc