@@ -59,15 +59,15 @@ func TestAppJsonMissing(t *testing.T) {
5959func TestAppJsonStack (t * testing.T ) {
6060 a := AppJSON {
6161 reader : func () ([]byte , error ) {
62- return []byte (`{"stack": "heroku-18 "}` ), nil
62+ return []byte (`{"stack": "heroku-22 "}` ), nil
6363 },
6464 ctx : testContext ,
6565 }
6666 err := a .Unmarshal ()
6767 if err != nil {
6868 t .Errorf ("expected no error, got %s" , err )
6969 }
70- if a .Stack != "heroku-18 " {
70+ if a .Stack != "heroku-22 " {
7171 t .Errorf ("expected heroku-22, got %s" , a .Stack )
7272 }
7373}
@@ -90,22 +90,19 @@ func TestAppJsonBuilders(t *testing.T) {
9090 }
9191}
9292
93- func TestAppJsonEOLStackWarning (t * testing.T ) {
93+ func TestAppJsonEOLStackError (t * testing.T ) {
9494 for _ , stack := range EOLStacks {
95- var buf strings.Builder
96- logger := zerolog .New (& buf )
97- ctx := logger .WithContext (context .Background ())
9895 a := AppJSON {
9996 reader : func () ([]byte , error ) {
10097 return []byte (`{"stack": "` + stack + `"}` ), nil
10198 },
102- ctx : ctx ,
99+ ctx : testContext ,
103100 }
104- if err := a .Unmarshal (); err != nil {
105- t . Fatalf ( "stack %s: unexpected error: %s" , stack , err )
106- }
107- if ! strings .Contains (buf . String (), "end-of-life" ) {
108- t .Errorf ("stack %s: expected EOL warning in log output , got: %s" , stack , buf . String () )
101+ err := a .Unmarshal ()
102+ if err == nil {
103+ t . Errorf ( "stack %s: expected error for EOL stack, got nil" , stack )
104+ } else if ! strings .Contains (err . Error (), "end-of-life" ) {
105+ t .Errorf ("stack %s: expected end-of-life error , got: %s" , stack , err )
109106 }
110107 }
111108}
0 commit comments