Skip to content

Commit f5ddc94

Browse files
committed
Noticed through a later test scenario output that adding the install lines in outputs is not correct way to solve the problem, testing out if dropping the stty calls in bin/test works better since this doesn't seem to work in the workflow
1 parent 09b51fd commit f5ddc94

File tree

10 files changed

+2
-18
lines changed

10 files changed

+2
-18
lines changed

bin/test

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,12 +408,10 @@ apply_patches() {
408408
rows=$(tput lines)
409409

410410
(
411-
stty rows 50 cols 1000
412411
eval "${command}; return \${PIPESTATUS[0]}"
413412
)
414413

415414
local result=${?}
416-
stty rows ${rows} cols ${cols}
417415

418416
return ${result};
419417
}

test/scenarios/apply-failure-corrupt-content/.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Processing patches configuration
2-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
32
- Applying patches for vaimo/composer-patches-target1 (1)
43
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
54
Change: value8 => valueC

test/scenarios/apply-failure-simple/.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
Processing patches configuration
2-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
32
- Applying patches for vaimo/composer-patches-target1 (1)
43
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
54
Change: value8 => valueC

test/scenarios/apply-real-package-success/.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/topological-sort (1.0.0): Extracting archive
54
- Applying patches for vaimo/topological-sort (1)
65
~ {{PATCHES-OWNER}}: patches/first-change.patch [NEW]
76
Change: Dependency => The cool thing

test/scenarios/apply-single-success/.output

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
54
- Applying patches for vaimo/composer-patches-target1 (1)
65
~ {{PATCHES-OWNER}}: patches/first-change.patch [NEW]
76
Change: value8 => valueX

test/scenarios/content-change/.output

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
54
- Applying patches for vaimo/composer-patches-target1 (2)
65
~ {{PATCHES-OWNER}}: patches/0_initial-change.patch [NEW]
76
Change: value8 => valueC
@@ -10,7 +9,6 @@ Processing patches configuration
109

1110
Writing patch info to install file
1211
Processing patches configuration
13-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
1412
- Applying patches for vaimo/composer-patches-target1 (2)
1513
~ {{PATCHES-OWNER}}: patches/1_second-change.patch [CHANGED]
1614
Change: valueC => valueX

test/scenarios/default-command-apply/.output

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5-
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
64
- Applying patches for vaimo/composer-patches-sandbox (1)
75
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
86
Change: value17 => valueB; value5 => valueA
97

10-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
118
- Applying patches for vaimo/composer-patches-target1 (2)
129
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
1310
Change: value8 => valueC

test/scenarios/default-command-redo/.output

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5-
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
64
- Applying patches for vaimo/composer-patches-sandbox (1)
75
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [MATCH]
86
Change: value17 => valueB; value5 => valueA
97

10-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
118
- Applying patches for vaimo/composer-patches-target1 (2)
129
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [MATCH]
1310
Change: value8 => valueC

test/scenarios/default-event-install/.output

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
Scanning packages for orphan patches
22
Validation completed successfully
33
Processing patches configuration
4-
- Installing vaimo/composer-patches-target2 (1.2.0): Mirroring from modules/composer-patches-target2
5-
- Installing vaimo/composer-patches-target3 (1.2.3): Mirroring from modules/composer-patches-target3
64
- Applying patches for vaimo/composer-patches-sandbox (1)
75
~ {{PATCHES-OWNER}}: patches/multiple-packages-single-file.patch [NEW]
86
Change: value17 => valueB; value5 => valueA
97

10-
- Installing vaimo/composer-patches-target1 (1.0.0): Mirroring from modules/composer-patches-target1
118
- Applying patches for vaimo/composer-patches-target1 (2)
129
~ {{PATCHES-OWNER}}: patches/single-package-single-file-no-version.patch [NEW]
1310
Change: value8 => valueC

test/scenarios/remote-unsecure-fail/.output

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ Processing patches configuration
22

33

44
[Composer\Downloader\TransportException]
5-
Your configuration does not allow connections to http://raw.githubusercontent.com/vaimo/composer-patches/bad/patch/url/single-package-single-file-no-version.patch. Override the 'secure-http' to allow: https://github.com/vaimo/composer-patches/blob/master/docs/CONFIGURATION.md#allow-downloads-from-unsecure-locations
5+
Your configuration does not allow connections to http://raw.githubusercontent.com/vaimo/composer-patches/bad/patch/url/single-package-single-file-no-version.patch. Override the 'secure-http' to allow: https://github.com/vaimo/composer-patch
6+
es/blob/master/docs/CONFIGURATION.md#allow-downloads-from-unsecure-locations
67

78

89

0 commit comments

Comments
 (0)