fixing tests

This commit is contained in:
Julien Neuhart
2019-09-30 16:38:52 +02:00
parent d45f2e1ec7
commit 8f721cd12a
5 changed files with 28 additions and 19 deletions

View File

@@ -45,8 +45,7 @@ RUN mkdir -p /usr/share/man/man1mkdir -p /usr/share/man/man1 &&\
ENV UNO_URL=https://raw.githubusercontent.com/dagwieers/unoconv/master/unoconv
RUN apt-get install -y python3 &&\
curl -Ls $UNO_URL -o /usr/bin/unoconv &&\
RUN curl -Ls $UNO_URL -o /usr/bin/unoconv &&\
chmod +x /usr/bin/unoconv &&\
ln -s /usr/bin/python3 /usr/bin/python &&\
unoconv --version

View File

@@ -9,10 +9,8 @@ if [ "$CURRENT_USER" != "gotenberg" ]; then
exit 1
fi
# Start the PM2 processes
# (Google Chrome headless & unoconv listener).
# TODO just start chrome
go run github.com/thecodingmachine/gotenberg/test/cmd/pm2
# Start Google Chrome headless.
go run test/cmd/chrome.go
# Run our tests.
if [ "$CODE_COVERAGE" = "1" ]; then

View File

@@ -6,7 +6,6 @@ import (
"io/ioutil"
"net/http"
"net/http/httptest"
"os"
"testing"
"github.com/labstack/echo/v4"
@@ -23,18 +22,6 @@ func TestPingHandler(t *testing.T) {
srv = New(config)
req := httptest.NewRequest(http.MethodGet, pingEndpoint, nil)
test.AssertStatusCode(t, http.StatusOK, srv, req)
// should returns a JSON as
// LOG_LEVEL is "DEBUG".
os.Setenv(conf.LogLevelEnvVar, "DEBUG")
config, err := conf.FromEnv()
assert.Nil(t, err)
srv = New(config)
req = httptest.NewRequest(http.MethodGet, pingEndpoint, nil)
rec := httptest.NewRecorder()
srv.ServeHTTP(rec, req)
assert.Equal(t, "application/json; charset=UTF-8", rec.Header().Get("Content-type"))
assert.Equal(t, http.StatusOK, rec.Code)
os.Unsetenv(conf.LogLevelEnvVar)
}
func TestMergeHandler(t *testing.T) {

View File

@@ -1 +1,3 @@
// Package chrome helps starting
// Google Chrome headless in background.
package chrome

23
test/cmd/chrome.go Normal file
View File

@@ -0,0 +1,23 @@
package main
import (
"context"
"github.com/thecodingmachine/gotenberg/internal/pkg/chrome"
"github.com/thecodingmachine/gotenberg/internal/pkg/conf"
"github.com/thecodingmachine/gotenberg/internal/pkg/xlog"
)
func main() {
const op string = "main"
config, err := conf.FromEnv()
systemLogger := xlog.New(config.LogLevel(), "system")
if err != nil {
systemLogger.FatalOp(op, err)
}
// start Google Chrome.
_, err = chrome.Start(context.Background(), systemLogger)
if err != nil {
systemLogger.FatalOp(op, err)
}
}