azures04/crafatar
1
0
Fork 0
mirror of https://github.com/azures04/crafatar.git synced 2026-05-06 11:00:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Finish merging

Browse Source
This commit is contained in:
Jake
2015-01-26 22:31:35 -06:00
parent 3def0910bc
commit c428499959
6 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/bulk.sh
View File

@@ -14,8 +14,4 @@ for uuid in `cat "$dir/uuids.txt"`; do
helm="&helm"
fi
curl -sSL -o /dev/null -w "%{url_effective} %{http_code} %{time_total}s\\n" "http://$host/avatars/$uuid?size=$size$helm"
<<<<<<< HEAD
done
=======
done
>>>>>>> Network rewrite/major cleanup, major caching changes, etc
done

8
test/test.js
View File

@@ -145,11 +145,7 @@ describe("Crafatar", function() {
it("should time out on skin download", function(done) {
var original_timeout = config.http_timeout;
config.http_timeout = 1;
<<<<<<< HEAD
networking.get_skin("http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", uuid, function(err, img) {
=======
networking.get_from("http://textures.minecraft.net/texture/477be35554684c28bdeee4cf11c591d3c88afb77e0b98da893fd7bc318c65184", function(img, response, err) {
>>>>>>> Network rewrite/major cleanup, major caching changes, etc
assert.strictEqual(err.code, "ETIMEDOUT");
config.http_timeout = original_timeout;
done();
@@ -157,11 +153,7 @@ describe("Crafatar", function() {
});
it("should not find the skin", function(done) {
assert.doesNotThrow(function() {
<<<<<<< HEAD
networking.get_skin("http://textures.minecraft.net/texture/this-does-not-exist", uuid, function(err, img) {
=======
networking.get_from("http://textures.minecraft.net/texture/this-does-not-exist", function(img, response, err) {
>>>>>>> Network rewrite/major cleanup, major caching changes, etc
assert.strictEqual(err, null); // no error here, but it shouldn't throw exceptions
done();
});