Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1578)

Issue 1093993003: Allow embedded_test_server to serve from multiple directories (Closed)

Created:
5 years, 8 months ago by wychen
Modified:
5 years, 7 months ago
CC:
cbentzel+watch_chromium.org, chromium-reviews, cjhopman
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Allow embedded_test_server to serve from multiple directories Add a new method to EmbeddedTestServer: ServeFilesFromDirectories(const std::vector<base::FilePath>& dirs) According to the order in dirs, the first matched file would be served. TEST=net_unittests --gtest_filter='EmbeddedTestServerTest.*'

Patch Set 1 #

Patch Set 2 : rebase #

Patch Set 3 : fix iOS #

Unified diffs Side-by-side diffs Delta from patch set Stats (+80 lines, -20 lines) Patch
A net/data/embedded_test_server/test.html View 1 chunk +1 line, -0 lines 0 comments Download
A net/data/embedded_test_server/test2.html View 1 chunk +1 line, -0 lines 0 comments Download
M net/net.gyp View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M net/test/embedded_test_server/embedded_test_server.h View 1 chunk +5 lines, -0 lines 0 comments Download
M net/test/embedded_test_server/embedded_test_server.cc View 3 chunks +30 lines, -20 lines 0 comments Download
M net/test/embedded_test_server/embedded_test_server_unittest.cc View 1 chunk +42 lines, -0 lines 0 comments Download

Messages

Total messages: 20 (8 generated)
wychen
PTAL
5 years, 8 months ago (2015-04-22 04:22:29 UTC) #2
satorux1
defer to mtomasz@
5 years, 8 months ago (2015-04-22 04:26:25 UTC) #4
mtomasz
lgtm
5 years, 8 months ago (2015-04-22 11:03:16 UTC) #5
commit-bot: I haz the power
Dry run: CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1093993003/1
5 years, 8 months ago (2015-04-22 16:58:06 UTC) #7
commit-bot: I haz the power
Dry run: Try jobs failed on following builders: ios_dbg_simulator_ninja on tryserver.chromium.mac (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator_ninja/builds/17354)
5 years, 8 months ago (2015-04-22 19:06:42 UTC) #9
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1093993003/40001
5 years, 8 months ago (2015-04-22 22:45:04 UTC) #12
wychen
Asanka, can you take a look as an owner? Thanks!
5 years, 8 months ago (2015-04-23 00:45:41 UTC) #14
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/58276)
5 years, 8 months ago (2015-04-23 01:56:05 UTC) #16
Paweł Hajdan Jr.
Why is this needed?
5 years, 8 months ago (2015-04-23 23:23:25 UTC) #17
wychen
On 2015/04/23 23:23:25, Paweł Hajdan Jr. wrote: > Why is this needed? Sorry for missing ...
5 years, 8 months ago (2015-04-23 23:27:16 UTC) #18
asanka
On 2015/04/23 at 23:27:16, wychen wrote: > On 2015/04/23 23:23:25, Paweł Hajdan Jr. wrote: > ...
5 years, 8 months ago (2015-04-23 23:53:25 UTC) #19
wychen
5 years, 8 months ago (2015-04-24 00:08:32 UTC) #20
On 2015/04/23 23:53:25, asanka wrote:
> You should be able to call ServeFilesFromDirectory() multiple times to add
> directories.

You are right. I'll just close this CL. Thanks for pointing this out.

Powered by Google App Engine
This is Rietveld 408576698