Skip to content

Commit 32fd13f

Browse files
committed
Updated tests
1 parent 9733e0c commit 32fd13f

File tree

5 files changed

+34
-18
lines changed

5 files changed

+34
-18
lines changed

.github/workflows/on_pull_request_merge.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
analyze:
88
name: Analyze
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010
permissions:
1111
actions: read
1212
contents: read
@@ -42,4 +42,5 @@ jobs:
4242
- name: Run tests
4343
run: |
4444
sudo apt install -y libavcodec-dev libavdevice-dev libavfilter-dev libavutil-dev libswscale-dev libswresample-dev libchromaprint-dev
45-
make test
45+
make container-test
46+

Makefile

+9
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,15 @@ test: go-dep
4848
@${GO} test ./pkg/...
4949
@${GO} test .
5050

51+
container-test: go-dep
52+
@echo Test
53+
@${GO} mod tidy
54+
@${GO} test --tags=container ./sys/ffmpeg61
55+
@${GO} test --tags=container ./sys/chromaprint
56+
@${GO} test --tags=container ./pkg/...
57+
@${GO} test --tags=container .
58+
59+
5160

5261
cli: go-dep mkdir
5362
@echo Build media tool

sys/ffmpeg61/avdevice_input_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//go:build !container
2+
13
package ffmpeg_test
24

35
import (

sys/ffmpeg61/avutil_log_test.go

+16-16
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ func Test_avutil_log_000(t *testing.T) {
1818
assert.Equal(AV_LOG_TRACE, AVUtil_log_get_level())
1919

2020
// Log a message
21-
AVUtil_log(nil, AV_LOG_TRACE, "This is a trace message")
22-
AVUtil_log(nil, AV_LOG_DEBUG, "This is a debug message")
23-
AVUtil_log(nil, AV_LOG_VERBOSE, "This is a verbose message")
24-
AVUtil_log(nil, AV_LOG_INFO, "This is a info message")
25-
AVUtil_log(nil, AV_LOG_WARNING, "This is a warning message")
26-
AVUtil_log(nil, AV_LOG_ERROR, "This is a error message")
27-
AVUtil_log(nil, AV_LOG_FATAL, "This is a fatal message")
28-
AVUtil_log(nil, AV_LOG_PANIC, "This is a panic message")
21+
AVUtil_log(nil, AV_LOG_TRACE, "This is a trace message\n")
22+
AVUtil_log(nil, AV_LOG_DEBUG, "This is a debug message\n")
23+
AVUtil_log(nil, AV_LOG_VERBOSE, "This is a verbose message\n")
24+
AVUtil_log(nil, AV_LOG_INFO, "This is a info message\n")
25+
AVUtil_log(nil, AV_LOG_WARNING, "This is a warning message\n")
26+
AVUtil_log(nil, AV_LOG_ERROR, "This is a error message\n")
27+
AVUtil_log(nil, AV_LOG_FATAL, "This is a fatal message\n")
28+
AVUtil_log(nil, AV_LOG_PANIC, "This is a panic message\n")
2929
}
3030

3131
func Test_avutil_log_001(t *testing.T) {
@@ -41,12 +41,12 @@ func Test_avutil_log_001(t *testing.T) {
4141
})
4242

4343
// Log a message
44-
AVUtil_log(nil, AV_LOG_TRACE, "This is a trace message")
45-
AVUtil_log(nil, AV_LOG_DEBUG, "This is a debug message")
46-
AVUtil_log(nil, AV_LOG_VERBOSE, "This is a verbose message")
47-
AVUtil_log(nil, AV_LOG_INFO, "This is a info message")
48-
AVUtil_log(nil, AV_LOG_WARNING, "This is a warning message")
49-
AVUtil_log(nil, AV_LOG_ERROR, "This is a error message")
50-
AVUtil_log(nil, AV_LOG_FATAL, "This is a fatal message")
51-
AVUtil_log(nil, AV_LOG_PANIC, "This is a panic message")
44+
AVUtil_log(nil, AV_LOG_TRACE, "This is a trace message\n")
45+
AVUtil_log(nil, AV_LOG_DEBUG, "This is a debug message\n")
46+
AVUtil_log(nil, AV_LOG_VERBOSE, "This is a verbose message\n")
47+
AVUtil_log(nil, AV_LOG_INFO, "This is a info message\n")
48+
AVUtil_log(nil, AV_LOG_WARNING, "This is a warning message\n")
49+
AVUtil_log(nil, AV_LOG_ERROR, "This is a error message\n")
50+
AVUtil_log(nil, AV_LOG_FATAL, "This is a fatal message\n")
51+
AVUtil_log(nil, AV_LOG_PANIC, "This is a panic message\n")
5252
}

writer_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
//go:build !container
2+
13
package media_test
24

5+
// TODO: Allow this test to run in containers
6+
37
import (
48
"context"
59
"path/filepath"

0 commit comments

Comments
 (0)