Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prevent wmic usage from pidusage #1

Merged
merged 5 commits into from
Jan 27, 2025
Merged

Prevent wmic usage from pidusage #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7fa788b
removed tests that check memory usage
BasvRossem Jan 27, 2025
cf1a675
remove memory checker tests
BasvRossem Jan 27, 2025
f6ffeb1
truly remove tests
BasvRossem Jan 27, 2025
a12fe91
expect empty values
BasvRossem Jan 27, 2025
217c2cf
check correct field
BasvRossem Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions test/e2e/misc/misc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,6 @@ $pm2 stop push.json

$pm2 list

#
# Max memory auto restart option
#
# --max-memory-restart option && maxMemoryRestart (via JSON file)
#
$pm2 kill
PM2_WORKER_INTERVAL=1000 $pm2 start big-array.js --max-memory-restart="20M"
sleep 3
$pm2 list
should 'process should have been restarted' 'restart_time: 0' 0

$pm2 delete all

#
# Via JSON
#
$pm2 start json-reload/max-mem.json
sleep 3
$pm2 list
should 'process should been restarted' 'restart_time: 0' 0

$pm2 delete all

$pm2 start env.js

OUT_LOG=`$pm2 prettylist | grep -m 1 -E "pm_out_log_path:" | sed "s/.*'\([^']*\)',/\1/"`
Expand Down
7 changes: 4 additions & 3 deletions test/programmatic/god.mocha.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ describe('God', function() {
});
});

it('should get monitor data', function(done) {
it('should get empty monitor data', function(done) {
var f = require('child_process').fork('../fixtures/echo.js')

var processes = [
Expand Down Expand Up @@ -295,10 +295,11 @@ describe('God', function() {
g.getMonitorData({}, function(err, procs) {
should(err).be.null();
procs.length.should.be.equal(processes.length);
// Monitoring memory and CPU no longer works
procs[0].monit.should.be.deepEqual({memory: 0, cpu: 0});
procs[1].monit.memory.should.be.greaterThan(0);
procs[1].monit.should.be.deepEqual({memory: 0, cpu: 0});
procs[2].monit.should.be.deepEqual({memory: 0, cpu: 0});
procs[3].monit.memory.should.be.greaterThan(0);
procs[3].monit.should.be.deepEqual({memory: 0, cpu: 0});
f.kill()
done()
})
Expand Down
89 changes: 0 additions & 89 deletions test/programmatic/max_memory_limit.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/unit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ runUnitTest $D/api.backward.compatibility.mocha.js
runUnitTest $D/custom_action.mocha.js
runUnitTest $D/logs.js
runUnitTest $D/watcher.js
runUnitTest $D/max_memory_limit.js
runUnitTest $D/cluster.mocha.js
runUnitTest $D/graceful.mocha.js
runUnitTest $D/inside.mocha.js
Expand Down
Loading