artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #571 from morlovich/morlovich-trunk-tracking-20131125

Browse Source 
Trunk tracking update for up to r3646
This commit is contained in:
Jeff Kaufman
2013-12-02 07:45:08 -08:00
parent 54352bff72 0076e45677
commit 1667879202
4 changed files with 18 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/nginx_system_test.sh
+4 -6
View File
@@ -1859,12 +1859,10 @@ keepalive_test "keepalive-static.example.com"\
test_filter combine_css Maximum size of combined CSS.
QUERY_PARAM="PageSpeedMaxCombinedCssBytes=57"
URL="$URL?$QUERY_PARAM"
# Make sure that we have got the last CSS file and it is not combined.
fetch_until -save $URL 'grep -c styles/bold.css\"' 1
# Now check that the 1st and 2nd CSS files are combined, but the 3rd
# one is not.
check [ $(grep -c 'styles/yellow.css+blue.css.pagespeed.' \
$FETCH_UNTIL_OUTFILE) = 1 ]
# We should get the first two files to be combined...
fetch_until -save $URL 'grep -c styles/yellow.css+blue.css.pagespeed.' 1
# ... but 3rd and 4th should be standalone
check [ $(grep -c 'styles/bold.css\"' $FETCH_UNTIL_OUTFILE) = 1 ]
check [ $(grep -c 'styles/big.css\"' $FETCH_UNTIL_OUTFILE) = 1 ]
# Test to make sure we have a sane Connection Header. See