Neither are in the AFPT, just push ups, sit ups and a 2 mile run. However, pull ups are a part of CD2 (conditioning drill 2), which is suppose to start becoming the "new standard" in the army, but most people won't see it outside basic. After basic, you may run into either... depends on your unit and who is running PT that day (but not on the test).