Skip to content

Commit 6fe3be5

Browse files
committed
chore(integration_runner): Fixes formatting
1 parent c35e124 commit 6fe3be5

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

daemon/internal/newrelic/integration/context.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import (
1212
)
1313

1414
type Context struct {
15-
PHP string // path to the PHP CLI executable
16-
CGI string // path to the PHP CGI executable
17-
Valgrind string // path to the Valgrind executable, or empty if disabled
18-
Env map[string]string // environment variables to pass to each test
19-
Settings map[string]string // settings to pass to each test
20-
Timeout time.Duration // maximum test duration
21-
OPCacheModuleLoaded map[string]bool // map of PHP and CGI to OPcache default loaded status
22-
UseOPCache bool // whether to use OPcache in tests
15+
PHP string // path to the PHP CLI executable
16+
CGI string // path to the PHP CGI executable
17+
Valgrind string // path to the Valgrind executable, or empty if disabled
18+
Env map[string]string // environment variables to pass to each test
19+
Settings map[string]string // settings to pass to each test
20+
Timeout time.Duration // maximum test duration
21+
OPCacheModuleLoaded map[string]bool // map of PHP and CGI to OPcache default loaded status
22+
UseOPCache bool // whether to use OPcache in tests
2323
}
2424

2525
func NewContext(php, cgi string) *Context {

daemon/internal/newrelic/integration/test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ func (t *Test) MakeRun(ctx *Context) (Tx, error) {
216216

217217
// Make a copy of t.PhpModules and remove any entries containing "opcache.so"
218218
// if opcache.so is loaded by default
219-
//
219+
//
220220
// three cases:
221221
// 1. C test - no opcache.so needed as PHP is not going to be run
222222
// 2. Web test and php-cgi has opcache.so loaded by default - remove any PHPMODULE spec for opcache.so
223223
// 3. PHP test and php has opcache.so loaded by default - remove any PHPMODULE spec for opcache.so
224224
phpModulesCopy := make(map[string]string)
225-
if (!t.IsC()) {
225+
if !t.IsC() {
226226
if (t.IsWeb() && ctx.OPCacheModuleLoaded[ctx.CGI]) ||
227227
(ctx.OPCacheModuleLoaded[ctx.PHP]) {
228228
for k, v := range t.PhpModules {

daemon/internal/newrelic/integration/transaction.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func PhpTx(src Script, env, settings map[string]string, ctx *Context) (Tx, error
7777
}
7878
if setOPCacheEnableCLI {
7979
phpSettings["opcache.enable_cli"] = "0"
80-
}
80+
}
8181
}
8282

8383
args := phpArgs(nil, filepath.Base(src.Name()), false, phpSettings)
@@ -171,7 +171,7 @@ func CgiTx(src Script, env, settings map[string]string, headers http.Header, ctx
171171
}
172172
if setOPCacheEnableCLI {
173173
cgiSettings["opcache.enable_cli"] = "0"
174-
}
174+
}
175175
}
176176

177177
if ctx.Valgrind != "" {

daemon/internal/newrelic/integration/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func GetOPCacheModuleLoaded(php, cgi string) map[string]bool {
5353
result := make(map[string]bool)
5454

5555
result[php] = IsOPcacheLoaded(php)
56-
result[cgi] = IsOPcacheLoaded(cgi)
56+
result[cgi] = IsOPcacheLoaded(cgi)
5757

5858
fmt.Printf("OPcache default loaded status: %+v\n", result)
5959

0 commit comments

Comments
 (0)