kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-13 05:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use os.Exit in exportable packages (#286)

Browse Source 
Fixes #285

Signed-off-by: David Cassany <dcassany@suse.com>
This commit is contained in:
David Cassany Viladomat
2022-01-12 08:57:41 +01:00
committed by GitHub
parent 4943ed6aef
commit 881bf03c3d
6 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/core/context/context.go
View File

@@ -135,7 +135,7 @@ func (c *Context) Copy() types.Context {
func (c *Context) Warning(mess ...interface{}) { func (c *Context) Warning(mess ...interface{}) {
c.Logger.Warn(mess...) c.Logger.Warn(mess...)
if c.Config.General.FatalWarns { if c.Config.General.FatalWarns {
os.Exit(2) panic("panic on warning")
} }
} }
@@ -146,7 +146,7 @@ func (c *Context) Warn(mess ...interface{}) {
func (c *Context) Warnf(t string, mess ...interface{}) { func (c *Context) Warnf(t string, mess ...interface{}) {
c.Logger.Warnf(t, mess...) c.Logger.Warnf(t, mess...)
if c.Config.General.FatalWarns { if c.Config.General.FatalWarns {
os.Exit(2) panic("panic on warning")
} }
} }

3
pkg/api/core/logger/logger.go
View File

@@ -17,7 +17,6 @@ package logger
import ( import (
"fmt" "fmt"
"os"
"path" "path"
"regexp" "regexp"
"runtime" "runtime"
@@ -253,7 +252,7 @@ func (l *Logger) Tracef(t string, args ...interface{}) {
func (l *Logger) Fatal(args ...interface{}) { func (l *Logger) Fatal(args ...interface{}) {
l.send(log.LevelFatal, "", args...) l.send(log.LevelFatal, "", args...)
os.Exit(1) panic("fatal error")
} }
func (l *Logger) Info(args ...interface{}) { func (l *Logger) Info(args ...interface{}) {

2
tests/integration/03_qlearning.sh
View File

@@ -67,7 +67,7 @@ testInstall() {
testFullInstall() { testFullInstall() {
output=$(luet install -y --config $tmpdir/luet.yaml test/d test/f test/e test/a) output=$(luet install -y --config $tmpdir/luet.yaml test/d test/f test/e test/a)
installst=$? installst=$?
assertEquals 'cannot install' "$installst" "1" assertEquals 'cannot install' "$installst" "2"
assertTrue 'package D installed' "[ ! -e '$tmpdir/testrootfs/d' ]" assertTrue 'package D installed' "[ ! -e '$tmpdir/testrootfs/d' ]"
assertTrue 'package F installed' "[ ! -e '$tmpdir/testrootfs/f' ]" assertTrue 'package F installed' "[ ! -e '$tmpdir/testrootfs/f' ]"
} }

4
tests/integration/25_virtuals.sh
View File

@@ -23,14 +23,14 @@ testBuildB() {
mkdir $tmpdir/testbuild2 mkdir $tmpdir/testbuild2
luet build --tree "$ROOT_DIR/tests/fixtures/virtuals" --debug --compression "gzip" --destination $tmpdir/testbuild2 test/b luet build --tree "$ROOT_DIR/tests/fixtures/virtuals" --debug --compression "gzip" --destination $tmpdir/testbuild2 test/b
buildst=$? buildst=$?
assertEquals 'builds of B expected to fail. It depends on a virtual' "$buildst" "1" assertEquals 'builds of B expected to fail. It depends on a virtual' "$buildst" "2"
} }
testBuildC() { testBuildC() {
mkdir $tmpdir/testbuild3 mkdir $tmpdir/testbuild3
luet build --tree "$ROOT_DIR/tests/fixtures/virtuals" --debug --compression "gzip" --destination $tmpdir/testbuild3 test/c luet build --tree "$ROOT_DIR/tests/fixtures/virtuals" --debug --compression "gzip" --destination $tmpdir/testbuild3 test/c
buildst=$? buildst=$?
assertEquals 'builds of C expected to fail. Steps with no source image' "$buildst" "1" assertEquals 'builds of C expected to fail. Steps with no source image' "$buildst" "2"
} }
testBuildImage() { testBuildImage() {

4
tests/integration/32_fileconflicts.sh
View File

@@ -60,7 +60,7 @@ testInstall() {
luet install -y --config $tmpdir/luet.yaml test1/conflict test2/conflict luet install -y --config $tmpdir/luet.yaml test1/conflict test2/conflict
#luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null #luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null
installst=$? installst=$?
assertEquals 'install test failed' "$installst" "1" assertEquals 'install test failed' "$installst" "2"
#assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]" #assertTrue 'package installed' "[ -e '$tmpdir/testrootfs/c' ]"
} }
@@ -72,7 +72,7 @@ testReInstall() {
luet install -y --config $tmpdir/luet.yaml test2/conflict luet install -y --config $tmpdir/luet.yaml test2/conflict
#luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null #luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null
installst=$? installst=$?
assertEquals 'install test succeeded' "$installst" "1" assertEquals 'install test succeeded' "$installst" "2"
luet install -y --force --config $tmpdir/luet.yaml test2/conflict luet install -y --force --config $tmpdir/luet.yaml test2/conflict
#luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null #luet install -y --config $tmpdir/luet.yaml test/c@1.0 > /dev/null
installst=$? installst=$?

2
tests/integration/32_fileconflicts_upgrade.sh
View File

@@ -67,7 +67,7 @@ testInstall() {
testUpgrade() { testUpgrade() {
out=$(luet upgrade -y --config $tmpdir/luet.yaml) out=$(luet upgrade -y --config $tmpdir/luet.yaml)
installst=$? installst=$?
assertEquals 'install test succeeded' "$installst" "1" assertEquals 'install test succeeded' "$installst" "2"
assertContains 'does find conflicts' "$out" "Error: file conflict found: file conflict between packages to be installed" assertContains 'does find conflicts' "$out" "Error: file conflict found: file conflict between packages to be installed"
luet upgrade -y --config $tmpdir/luet.yaml --force luet upgrade -y --config $tmpdir/luet.yaml --force