diff options
| author | Danila Kiver <danila.kiver@mail.ru> | 2019-07-07 11:20:41 +0300 |
|---|---|---|
| committer | Danila Kiver <danila.kiver@mail.ru> | 2019-07-07 11:20:41 +0300 |
| commit | 2bfade4391bb6d247ddab2d129d0529471c17063 (patch) | |
| tree | a7fd680b742f3a348f4434d5391fbc19f29e5a2b /pkg/systemdgen/systemdgen_test.go | |
| parent | 8fde4194b6a21bc54d83260990e839da9e1fe1e8 (diff) | |
| download | podman-2bfade4391bb6d247ddab2d129d0529471c17063.tar.gz podman-2bfade4391bb6d247ddab2d129d0529471c17063.tar.bz2 podman-2bfade4391bb6d247ddab2d129d0529471c17063.zip | |
Do not hardcode podman binary location in generate systemd.
It is not correct to rely on specific location of the podman binary.
In most cases it is /usr/bin/podman, but sometimes is not (e.g. in
system tests). Use /proc/self/exe instead of hardcoded path.
Signed-off-by: Danila Kiver <danila.kiver@mail.ru>
Diffstat (limited to 'pkg/systemdgen/systemdgen_test.go')
| -rw-r--r-- | pkg/systemdgen/systemdgen_test.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkg/systemdgen/systemdgen_test.go b/pkg/systemdgen/systemdgen_test.go index a0f6a1889..e413b24ce 100644 --- a/pkg/systemdgen/systemdgen_test.go +++ b/pkg/systemdgen/systemdgen_test.go @@ -58,6 +58,7 @@ PIDFile=/var/run/containers/storage/overlay-containers/639c53578af4d84b8800b4635 WantedBy=multi-user.target` type args struct { + exe string name string cid string restart string @@ -73,6 +74,7 @@ WantedBy=multi-user.target` {"good with id", args{ + "/usr/bin/podman", "639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401", "639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401", "always", @@ -84,6 +86,7 @@ WantedBy=multi-user.target` }, {"good with name", args{ + "/usr/bin/podman", "foobar", "639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401", "always", @@ -95,6 +98,7 @@ WantedBy=multi-user.target` }, {"bad restart policy", args{ + "/usr/bin/podman", "639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401", "639c53578af4d84b8800b4635fa4e680ee80fd67e0e6a2d4eea48d1e3230f401", "never", @@ -107,7 +111,7 @@ WantedBy=multi-user.target` } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - got, err := CreateSystemdUnitAsString(tt.args.name, tt.args.cid, tt.args.restart, tt.args.pidFile, tt.args.stopTimeout) + got, err := createSystemdUnitAsString(tt.args.exe, tt.args.name, tt.args.cid, tt.args.restart, tt.args.pidFile, tt.args.stopTimeout) if (err != nil) != tt.wantErr { t.Errorf("CreateSystemdUnitAsString() error = %v, wantErr %v", err, tt.wantErr) return |